Merge branch 'js/fsmonitor-refresh-after-discarding-index'