Merge branch 'features/JAL-4061_and_JAL-4062_findselectfeatures' into features/r2_11_...