Merge "First cut of user restriction layering."