Merge pull request #2312 from ArsenShnurkov/bug36724