Back port of issue #21126 to 2.1.14