Merge "Update sdc merge template and job"