[trunk r16-7259-g4a514ea759f]
