This issue is a continuation of #25682
This issue is a continuation of #25682