Merge branch 'bp/fsmonitor' into maint