Merge branch '2.2.x' into 2.3.x

See gh-23495
This commit is contained in:
Stephane Nicoll 2020-09-28 14:40:10 +02:00
commit 209f92cfd4