Merge branch 'develop' into final_fixes
task #final_fix: Features update
Merge branch 'final_fixes' into develop