Merge pull request #8804 from neheb/cif