Merge branch 'develop_ns_file_editor' into develop
Merge branch 'develop_ns_template' into develop