2.4-develop
Merge branch '2.4-develop' into Arrows-AC-14808-v8
AC-16248: PHPUnit 12 Upgrade | Fix Framework unit tests