Merge OF1.0 Changes

reviewer:@capveg