refs #32882
Merge branch 'bugfix/tel-link-refactoring2'

Conflicts:
	war/src/main/webapp/WEB-INF/templates/vm/GlobalMacros.vm