I just completed another stay there. Same situation as explained in my post #14 of this thread. Booked luxury room and received junior suite. Same room (but on another floor) as on the pictures provided in #14. Despite it was close to midnight when I checked-in (due to a 5 hrs delay of my AC flight from YYZ ), the guest relations manager was still there to welcome me, thanked me for my loyalty and informing me about the upgrade.
A plate of an excellent chocolate cake was placed in the room along with a bottle of water.
In summary, Another excellent stay in this great hotel ^