8374: Addressing review comments