HIVE-8834: initial work