Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...