Forward port of issue #21876 to 2.3.x.