merge r7664 from 3.4