[10092014] - Thien push before merge bs135