Merge branch 'js/commit-slab-decl-fix'