task #final_fixes: MInor fix
Merge branch 'final_fixes' into develop