BZ-999950: support for multi users form edition
Merge remote-tracking branch 'origin/master'