2.4-develop
AC-16248: PHPUnit 12 Upgrade | Fix Skipped Unit Tests
AC-16248: PHPUnit 12 Upgrade | Unit test fix