Merge pull request #21470 from mattwire/templatecontributioncreate