[MP] Rend2: Merge fixes/changes from rd-vanilla