AD-634: Corrected the broken glossar terms
Merge remote-tracking branch 'origin/APD-634' into develop