Merge branch 'js/lift-parent-count-limit'