Merge branch 'features/JAL-2376_add-horizontal-bar' into develop