merge khanh - master