Merge folder_support