Merge pull request #120982 from HolonProduction/thou-shalt-be-warned