Merge branch 'tr/commit-slab-cleanup'