REVIEW (27): Backport set mdc userid changes