merge jiliang develop branch

merge v76 develop