Ticket #39615 Fix versions for upgrades