Release 3 notes
Merge remote-tracking branch 'origin/develop' into develop