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

Release: Merge back 2.42.1 into bugfix from: master-into-bugfix/2.42.1-2.43.0-dev #8366