Merge branch 'bugfix/unshared-inbox-check' into 'develop'