Merge pull request #3694 from howard0su/issue3682