Prepare for new upstream 1.17.0

Bastian Germannrequested to merge
(removed):master into master

All necessary changes to build with the new upstream version 1.17.0

Merge request reports