Comment From: sbrannen

This is effectively a follow up to #27822

Comment From: sbrannen

This has been merged into main.

Thanks