Merge pull request #13644 from davezarzycki/nfc_hasParenSema