merge to r42871(trunk)