[29082014] - Thien commit before bs pull