trunk-tracking: update from r3895 to r3924