2.4-develop
AC-16248: PHPUnit 12 Upgrade | Unit test fix
Merge remote-tracking branch 'origin/2.4-develop' into AC-15170