APD-540: Glossar referencing in glossar page does not work
Merge branch 'APD-540_mse' into develop