merge 2.10.x into master

It's fun to finish the P-I-T-A
It's fun to finish the P-I-T-A
embrace each form of pain git knows how to inflict,
let your life become merge conflicts