Fix for EZP-23122: Add support for custom tag names
Merge pull request #1021 from peterkeung/ezoe-custom-tag-names

Fix for EZP-23122: Add support for custom tag names