Merge "Dealing with upgrade from previous Folder implementation"