Merge "Savanna client is now using separated LP project"