Release: Merge back 2.38.2 into bugfix from: master-into-bugfix/2.38.2-2.39.0-dev

Release: Merge back 2.38.2 into bugfix from: master-into-bugfix/2.38.2-2.39.0-dev #4298