Added TS-2739 to changes