--Upgrade failure fix
Merge pull request #737 from NileemaJadhav/HR-14-fixes

--Upgrade failure fix