Merge changes from 2.27.2 into the main branch #2206
Description
Background
Changes to the old supported version should be ported to the most recent version too.
Feature
Merge changes from 2.27.2 into the main branch
{{ message }}
Changes to the old supported version should be ported to the most recent version too.
Merge changes from 2.27.2 into the main branch