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