hive: merge 01-add-clifirst-to-schema-and-types (squashed)