Fixed #5941: merge develop branch to renderer branch.