[trunk r16-7424-g0c763ab721b]
