Merge branch '2.1.x' into 2.2.x

See gh-23494
This commit is contained in:
Stephane Nicoll
2020-09-28 14:39:15 +02:00