Folders was reorganized
Merge branch 'master' into API10
Folders was reorganized