Merge branch 'master' into merge_branch
Merge remote-tracking branch 'AWS/master'
change dir structure
size() support, test needed