I'll do a dedicated PR for 2.6.x that is not a traditional cherry-pick