Merge "[Thread] prefer only ML-EID in case OMR is missing" into main