Added missing field.
Resolved conflicts when both me and calletuvesson made changes in the same file.
Fixed merge mistake.