Merge modifications from Schiller into Berliner