Added TS-2791 to changes