bugfix
Merge branch 'feature/glaucoma-2.1' into g21develop