merge xinhuarao branch