[03092014] - Thien commit before merge bs135 17h26