hive: merge 04-simplify-model-configuration (squashed)