Merge branch 'js/builtin-add-i-cmds' into maint