Merge branch 'js/fsmonitor-unpack-fix'