HIVE-7816: initial work