Release: Merge back 2.42.2 into bugfix from: master-into-bugfix/2.42.2-2.43.0-dev

Release: Merge back 2.42.2 into bugfix from: master-into-bugfix/2.42.2-2.43.0-dev #12938