Merge branch 'bug/JAL-2791selectVisibleFeatures' into