Capturing more uses cases for AMEC-2225
Merge remote-tracking branch 'origin/dev-AMEC-2225' into release/2.9.6rc
set version in pom to 2.9.6
Merge branch 'master' into release/2.9.6rc