Patch 8
this one includes !40 (merged), it was split to enable easier review of ce6fae08 and also the option to only merge the first one for now
this one includes !40 (merged), it was split to enable easier review of ce6fae08 and also the option to only merge the first one for now