remove folder operations
update README
Merge branch 'staging' into 5.6