Update geometry, xpressive from develop.