Added Gautes changes from Bergen.

No match.