[OE-5245] more disorder changes
Merge branch 'feature/glaucoma-2.1' into jira/OEM-282