See also #19612

Comment From: scottfrederick

Closing in favor of PR #19764