[31082014] - Thien commit last 31/8