Merge pull request #9675 from dengqf6/zt1