HIVE-8995: initial work