Merge branch 'develop' into 011-Photo_reports_import
task #011-Photo_reports_import: Patch for core apllied.
Merge branch '011-Photo_reports_import' into develop