Regression after updating template.xml from blue_eagle