task #00017-Theme_lines_type: Features update
Merge branch '00017-Theme_lines_type' into develop