Merge branch 'bugfix/inbox-misleading-warning' into 'develop'