Merge branch 'jc/commit-slab'