Merge "Initial implementation of optf-osdf csit"