Merge branch 'slab/urgent' into slab/next