[trunk r16-6952-g14cd2833b27]
