Merge branch 'slub/cleanups' into slab/next