Release: Merge back 2.41.2 into bugfix from: master-into-bugfix/2.41.2-2.42.0-dev

Release: Merge back 2.41.2 into bugfix from: master-into-bugfix/2.41.2-2.42.0-dev #17579