Update template package to latest from upstream