Merge "Adding default user restrictions for non-admin users." into pi-dev