Issue 16651

Please hold for merge until reviewed by either @thatch45 or @s0undt3ch