am ce9ee16d: Merge "Conservatively estimate geometry bounds" into klp-dev

* commit 'ce9ee16d654a42f31d211c60708d7b23f17c1d8e':
  Conservatively estimate geometry bounds