Merge branch 'SCHOLAR-3.x' into 4373
Fix merge conflict, all PR's must change this file in the same place :-)
Fix test conflicts
Fix merge conflicts again
Merge branch 'SCHOLAR-3.x' into 4373
Merge