Merge branch 'simplepolicy-announce-leak' into 'develop'