Brendan Quinton lock-upgrade8636