fixes #18331
Merge pull request #18336 from wuxxin/2014.7

fixes #18331