TS-2889 updating changes