trunk-tracking: update from r3811 to r3927