Merge branch 'us/unpack-trees-fsmonitor'