Update spirit, polygon from develop.