Addressing review comments for 7920