Merge branch 'js/rebase-i-progress-tidy'