some more proto support for files encryption
Merge branch 'master' into beta