Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8