Update align, geometry from develop.