Merge branch 'dcache-cleanup'