am 84617349: am c675642e: am d33fe6fd: Fix geometry updates

* commit '8461734926e3c2a0899ac89dc2b1a8d4fc3c77ac':
  Fix geometry updates