Merge "Improved Collaborators UX"