Merge branch 'patch/JAL-2663_filterAACons' into develop