2.4-develop
Merge branch '2.4-develop' into commpr
AC-16360::Unit Tests are failing across all PRs
migrated pull request #11459 to 2.3 develop