remove unnecessary folder operations
Merge branch 'staging' into 5.6