trunk-r4372