Merge pull request #12929 from mikedn/cast-cmp-test