Added TS-2811 to changes