Left out Oracle in the list of custom templates
Merging develop