Merge fetzerch branch