Merge "Add extended server attributes in list detail schema"