[trunk r16-7394-gd93c8a679b2]
