Upgrade Fix from 4.4 to 4.5
Merge pull request #2802 from atif-shaikh/UpgradeFix

Upgrade Fix from 4.4 to 4.5