Manual Merge of important files from branch calibration_updates