Issue: #24706 (comment)