Merge pull request #3786 from my-git9/compatibility-1.6

Merge pull request #3786 from my-git9/compatibility-1.6 #3928