Merge branch 'develop' into 00017-Theme_lines_type
task #00017-Theme_lines_type: Code style
Merge branch '00017-Theme_lines_type' into develop