Merge branch 'master' into filesystem-ts