Revert "Master clear folder"

This reverts commit cb6ec5e585c0f0ce2b829f8cbdeab2e2ae2f212e.
Revert "Revert "Master clear folder""

This reverts commit af4b067fcda0864392ffb03ccefa155a3d86e260.
Revert "Revert "Revert "Master clear folder"""

This reverts commit 4a3c8bd31fea612f367580c9d263988ac552094c.