2.4-develop
AC-16248: PHPUnit 12 Upgrade | Fix Framework unit tests
AC-16236: PHPUnit 12 Upgrade|Unit Test Fix