Merge branch 'jk/commit-info-slab' into next