Merge pull request #15984 from dagood/remove-conversion/master