Improving the update path.
Fix merge conflicts
Merge pull request #6603 from openscholar/fix-update

Improving the update path.