Merge "Minor code updates to SpecialListgrouprights"