Fix for OC-11490 bug seen during 11.1.3 upgrades