[OE-2557] syncing
Merge branch 'jira/2557' of github.com:openeyes/OpenEyes into jira/2557