Fixed #16096 -- Added origin attribute to template instances.

Thanks jdunck for the suggestion.