Update geometry, thread, test from develop.