task #00024-Global_styling: Features update
Merge branch '00024-Global_styling' into develop