[TC] [77366968] address pr comments