RD office fixes.
Merge pull request #5450 from Zuhayr/master

Fixes
Merge pull request #5456 from Asanadas/master

RD office fixes.
Fucking Hell I'm an idiot.