Standard properties preferred over vendor prefixes

This is for issue #6320. I cherry picked desired changes out of pull request #6321.