Update template to keep pass with core and instance repo changes.
Update template to keep pass with core and instance repo changes.