Release: Merge back 2.42.0 into dev from: master-into-dev/2.42.0-2.43.0-dev

Release: Merge back 2.42.0 into dev from: master-into-dev/2.42.0-2.43.0-dev #22643