task #00047-style_fix: Minor fix
Merge branch '00047-style_fix' into develop