Merge branch 'js/apply-build-ancestor'