Code

Merge branch 'jc/cachetree' into cr/reset