Issue #4768: merge develop branch to master branch

merge develop branch to master branch