Merge "dovetail: fix wipe workspace error"