cherry-pickery, issues #57 #58
Source for buildrump.sh git rev eda9f9da5f335226a57682b14a249fbc294eb57f