MERGE FROM MASTER: fixed file in new_folder