[8.09] x86: merge r13158