REVIEW (2.7): Backport set mdc userid changes