Re rolling #2809 agaisnt 3.5
Merge pull request #2883 from openscholar/SCHOLAR-3.5-2809

Re rolling #2809 agaisnt 3.5