Merge branch 'bp/fsmonitor-bufsize-fix'