Just a few steps towards being able to enable -Werror.
-Werror
enabled an automatic merge when the pipeline for 43742598 succeeds
mentioned in commit f801d377
merged