Merge branch 'mw/maint-gcc-warns-unused-write' into maint