[MERGE]latest trunk-proto61.