Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint