SI-6502 Addressing review comments