Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak