Prepare release 2.18.0
Merge branch 'release-2.18.0' into develop
Building new 2.19