Merge pull request #1663 by @rzhxeo