Merge pull request #9551 from neheb/elek