Updated changes with TS-2815