[642] More template changes