Remaining AB merges for 30x/master sync (except YODA 1.8.0)
As requested by Chris, this MR is a collection of missing cherry-picks and manual diff merges, which I think brings in everything we need from the 30x branch (and keeps the YODA 1.8.0 compatibility).