Benito Yancey lock-upgrade2844