Merge pull request #7915 from rohankatkar/Upgrade-changes-for-7836