Provitional fix to bring back templating
Merge remote-tracking branch 'origin/master' into drag-and-drop-refactor