Merge "Improving hierarchy dump speed"