HIVE-8913: address RB comments