[30082014] - Thien commit before merge bs135