Merge branch 'SCHOLAR-3.x' into 3215
Merge branch '3215' into 4910-1