Merging from OberstK