Merge pull request #12530 from colemanw/plainObject