Merge of config with zc702-TUGRAZ config.