Add Herald notes
Merge branch 'master' into 2.2
Add 2.2.0-rc1 herald notes