Merge "Add more dump logs for debugging purpose" into sc-dev