Merging in Master for changes to Template

same reason as the last one.