Merge branch 'js/daemon-test-race-fix' into maint