[OE-4364] - gonio changes