[geometry] merged to release