Merge branch 'cb/fsmonitor-intfix' into maint