Merge pull request #736 from NileemaJadhav/HR-14-fixes

--Bug fixes
--Upgrade failure fix