Merge "Improving hierarchy dump for test failure" into sc-dev