[geometry] merged to release

[SVN r85862]