Merge pull request #7178 from neheb/setser