Merge "Improving memory dump diag" into sc-v2-dev