Merge branch 'hotfix/release-1.1'
Recreated features to capture editor role, among others
Merge branch 'hotfix/release-1.2' into develop