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