[geometry] merged for 1.54 release