Merge recent improvements to app-template.