Merge "fix workspace permission error"