Merge pull request #12602 from colemanw/checkIfFieldExists