Developer/tuan08

Merge stable code