HIVE-8852: address RB comments