Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'