NXP-14879: change aggregate descriptor to nest property inside properties