BS140915 fix bug
[15092014] - Thien merge bs135