4.5 Upgrade fix
Merge pull request #3409 from monishdeb/upgrade-fix

4.5 Upgrade fix