Merge "fix typo sub_folders"