[28082014] - Thien commit before merge bs135 branch