Merge the OMF 6 branch