C2 Merge 1

I had some difficulties with merge conflicts, but hopefully it's fixed now.