After TLJ, I hope that Disney includes the Waiter droid body style if they do another round of protocol droids. I don't see Hasbro tackling it these days and it would be a fun droid to build in a few colors.