APD-605: Modified code to link terms
Merge branch 'APD-605' into develop