Miquel Ledbetter lock-upgrade0619