Mark Landseer lock-upgrade1612