We received positive feedback from that change, so we decided to backport #34673 to the main supported version.