Merge "Fixing issue where folder names aren't being persisted"