CAAERS-7022, Commit to RC1. (fixing merge issue)