Merge remote-tracking branch 'upstream/edge' into modify/delta-calibrate-improved...