Merge #16280

Merge #16280, it had some conflicts