Merge "Updated headers for optf/has"