Merge branch 'fix/require-fs'