Thomas Stang lock-upgrade1016