Bug fixing: real time collaboration
Merge remote-tracking branch 'origin/release-candidate' into release-candidate