issues #2895:Synchronize JSB from master to developer
Merge pull request #3889 from Dhilan007/di2895

[ci skip]issues #2895:Synchronize JSB from master to developer