merge r16978 to 8.98