Merge remote-tracking branch 'origin/SCHOLAR-3.x' into 4917
Merge branch '4917' into 4917-add_perms