Merge "Fix issue with missing row/column on workspace"