"squash" & rebasing of #9137

My attempt at "squashing" #9137 into a single commit and rebasing against 3.0.0-wip HEAD.
Seems successful AFAICT.
/cc @adamjacobbecker et al. for QC