APD-535: glossar.json is loaded only once
Merge branch 'APD-535' into develop