Merge "Correct permission used for user related user restrictions." into udc-dev