B2.2.x

Hello,

It's the same remarks with #1690 but for the 2.2.x branch.

Sincerly,