Relevant PR: #48321
Relevant PR: #48321