Fixed conversion warning
Merge branch 'develop' into release-1.6.11
Merge branch 'release-1.6.11'