fixes ZEN-13287 reviewed by myself fixed by emiller edit templates fully in the component panel
merging from develop