[07092014] - Thien commit before merge bs135