Merge branch 'js/re-running-failed-tests'