Merge "Making default folder name blank"