[25082014]-Thien commit before merge xuanbach branch