Merge pull request #1664 by @rzhxeo