423.01 - merging OMC changes - canonical_machine