Merge "Fix DO user restrictions persisting in UMS"