fix merge for all commits in #746
Merge pull request #1794 from openscholar/746-merge-fix

fix 3.3 merge for all commits in #746