Yep, except this time J class pax get the Shangri-La instead of the Peninsula.

I've already booked KA, mainly because they fly to PVG (and CX don't), their times are better and they offer F (admittedly, KA's J product sounds pretty inferior).