[8.09] merge r16488