[#83211730] Addressing PR comments.