Merge branch 'hotfix/tag' into develop
Merge branch 'release/TER'
[BUGFIX] Cleanup of ts constants and bugfixes