[#6556] start fixing undefined vars in templates
4 files changed