trunk-r4372
