GitLab

- Reintegrated the other-tags branch into my staging branch.  Local edits were required to integrate with the changes from the event-api branch.