Merge branch 'core/urgent' into locking/urgent, to collect all pending locking fixes