Prepare for upstream version 1.18.0

Bastian Germannrequested to merge
(removed):master into master

These are the necessary changes for the new upstream version.

Merge request reports