[trunk r16-7708-gf8380ded1f6]
