[METRICS-383] Review fixes for octo