Comment From: mbhave

Closing in favor of PR #19699.