HIVE-8834: address RB comments