Fixed #5636: merge develop to master

Fixed #5636: merge develop to master