Merge branch 'cb/fsmonitor-intfix'