Unify methods to one.
Merge branch '4910-1' of github.com:openscholar/openscholar into 4910-1