Matthew Niland lock-upgrade2566