Add template to fix production error
Merge branch 'distribution-plugin' into cirandas