This is a manual sweep of !58752 (merged) into master, conflicts were resolved and commits squashed. Some conflict resolved, should now contain only expected changes. Many of them are related to calibration data processing (and inclusion of SuperCells there).