ehance issue #29630

Comment From: rstoyanchev

There is no need for a separate PR for this. A decision on this can be made either way as part of #29630.