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