Hassie Beardsley lock-upgrade1115