Merge branch '105-issue-n-trial' of...

Merge branch '105-issue-n-trial' of ssh://gitlab.e.foundation:2222/e/apps/eDrive into 105-issue-n-trial