Merge "Allow selective detailed dumps of caches" into tm-dev