Merge pull request #7339 from neheb/cyrus