Merge "Add merge job for optf-has"