Fix broken test after g-d-m changes
Merge branch '2.3.x'