Merge branch 'rj/commit-slab-fix'