User roles 1980 1934 1935 1936

For merge with internal/next.
(Replaces ealier branch.)