Can anybody that has stayed recently confirm if they have been waived the Resort Fee for being Diamond? Also have you been upgraded?

I booked a points/money award stay and the Diamond desk said that I will have to pay the resort fee but from what I have been reading it seems like that's not the case?

Also very interested in knowing recent upgrade experiences as I booked the Diamond tower (it's the only one I could book with points).

Thanks!