Merge "Fix the merge job"