Concurrent editing (#841)

Merged Mohammad Nakhaee requested to merge concurrent_editing_841 into develop

Merge request reports