Merge branch 'develop' into features_update
task #features_update: Contact us form fix
Merge branch 'features_update' into develop