4.5 upgrade fix
Merge pull request #3436 from monishdeb/upgrade-fix

4.5 upgrade fix