Fix gcc7 deprecation warnings

(cherry picked from commit cb675a68)

Merge request reports

Loading