Merge branch 'js/stress-test-ui-tweak'