Merge remote-tracking branch 'origin/dev-AMEC-2225' into release/2.9.4rc
Capturing more uses cases for AMEC-2225