B2.1.x

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