Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'