Merge "Add optf/osdf folder"