Merge "Conservatively estimate geometry bounds" into klp-dev