Merge branch 'js/apply'