Merge "Fix "some user restrictions not working" issue"