Merge branch 'develop' into bulkEditorE4