Merge remote-tracking branch 'upstream/develop' into email-fix-develop