Merge pull request #1659 by @rzhxeo