Merge "Allow file manipulation in the work dir" into feature/zuulv3