2.4-develop
Merge branch '2.4-develop' into Arrows-AC-14808-v8
PHPUnit 12: Fix CollectionTest complex interface mocks