Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop