Forward port of issue #21654 to 2.4.0-M1.