Merge Raumkraut's updates