Merge pull request #17875 from colemanw/customFieldVersionCheck