HIVE-7334: initial ground work