Make default UID None (OMS-408)