[trunk r16-7382-g15ca69befd0]
