Merge branch 'bug/JAL-2791exportFilteredFeature' into merge/JAL-2791