Merge branch 'js/cherry-pick-usability'