HIVE-8913: initial work