Merge pull request #13314 from colemanw/dev/core#337