My branch is StAlRuth-downstream, it has all the fixes!