Merge branch 'js/fsmonitor-unflake' into maint