#2620 do nothing if template isn't defined
#2620 ee.jar with fixes