cherry-pick upstream improvements
Source for buildrump.sh git rev f3e0a539a0fc57e8a0476537f64180aed2b3e246