Merge "path correction for the cokpit community"