Update template
#17532 - avoid sanitising a number value away
#17488 - keep output buffering on
Update template