Merge branch 'develop' into nameEditorE4