Merge branch 'features/JAL-1738_JAL-345_selectionfromhighlight' into develop