Merge "Update and simplify C jobs"