Merge "Change sdc-merge template"