[31082014] - Thien commit before merge 22h35