task #00024-Global_styling: MInor fix
task #00024-Global_styling: Minor fix
Merge branch '00024-Global_styling' into develop