[31082014] - Thien commit after merge and add remain task