Merge branch 'caching'
Merge branch 'encryption'