Fixing russian olives and ferry data
Merge from master