Merge pull request #120978 from HolonProduction/is-this-a-valid-change