Merge branch 'SCHOLAR-3.x' into 975.
Change function name.
Removing the patch for purl module.
Fix conflict.