Merge "path corrections in the cockpit"