Basically, we need tests certifying #2828 & #2836 work after the revert done in 49833f7795d665ff1d543c4f71f29fca95b567e9. We should land them on all 3 branches.
