[TS-2503] : updated per James Peach's review comments