Jeffrey McCollom lock-upgrade2842