Applied Marko Knoebl patch step/locale fix