[trunk r16-7949-g6c5de6335f5]
