Merge branch 'tip/locking/urgent'

Pull in dependencies.