Merge branch 'nk/perf-fsmonitor-cleanup' into maint