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