Merge "Reapply "add more unit tests for WorkspaceItemProcessor"" into main