Patch Set 2: Looks good to me, approved; Build Successful; IP review completed

Rebased to master

Works for files but not for folders. The fix for folders has to be done in a different place. I'll open a bug for that.