[18092014] - Thien commit...