HIVE-9097: initial work