Merge branch 'issue-98-o' of ssh://gitlab.e.foundation:2222/e/apps/eDrive into issue-98-o