Merge branch 'js/no-limit-boundary'