IDEX-1275: User devided on User and UserDescriptor