merge from kugua