task #00011-Add_helper_functions: Minor fix
Merge branch '00011-Add_helper_functions' into develop