Merge "Addressing slow rotation due to folders (issue 5297213)"