Prepare release 2.20.0
Merge branch 'release-2.20.0' into develop
Building new 2.21