fixed typo
[OE-5214] create "Other" further finding
resolved merge issues
Merge remote-tracking branch 'remotes/origin/feature/glaucoma-2.1' into jira/OE-5210