Merge "Rewrite dumping NSSL hierarchy" into sc-v2-dev