Merge "Handling invalid path of workspace register and move"