Merge "Add mechanism for temporary user rights"