trunk-r4371