Merge "Clean up JSS dumping code." into sc-dev