Merge branch 'locking/urgent' into locking/core, to pick up fixes