APD-519: Enhancement of terms from glossar
Merge branch 'APD-519' into develop