Mailbox is expected to be passed by ID
Merge branch 'develop' into feature/refactor-storage