[28082014] - Thien fix after merge bs135 branch