boost: backport patch from OE