US#79708 Entity Templates Mashup