Merge pull request #9618 from neheb/ecd