Merge "Changed template option label"