Merge "fixing puts workfiles in wrong directory."