Editor / Fix template field initialization when element does not exist. Only generate the element when requested in the editor.
Merge remote-tracking branch 'upstream/stable-develop' into develop