merged with elton updates for fixing ticket 335 SOLA generic (error with survey points)