Merge "Fix optf has and osdf csit failures"