Merge branch 'master' into split-fs-from-array