HIVE-4373 - addressing review comments from carl