[TS-2683] Addressing review comments from James Peach
[TS-2862]: Addressing review comments from James Peach