add upstream template changes