Fix bug found by Joseph, where upgrades fail on frontends
Better OC-11382 fix
Better OC-11382 fix part 2
Better OC-11382 fix part 3