Terra Stillman lock-upgrade0222