Merge pull request #12855 from colemanw/dev/core#391