Merge branch 'develop' into 00010-Import_form
task #00010-Import_form: Security fixes
Merge branch '00010-Import_form' into develop