track escaping change in upstream template