Deleted custom tag template to avoid merge-conflict with development branch