Fix build issues in master after GCC 7.1 upgrade

Merge request reports

Loading