Merge branch 'bug/JAL-1703_hint_select_by_annot' into develop