Release note update
Merge branch 'release' into upstream