Merge "workspace bug fixes"