r28 Caught up with master, as far as merges go. Modified geometry for my own testing.