Forward port of issue #21342 to 2.2.7.