Merge pull request #1657 by @rzhxeo