geometry fix
Merge remote-tracking branch '52n/master'