6 times speedup of geometry ray intersection
Merge branch 'mainstream'