RD office fixes.
Merge pull request #5456 from Asanadas/master

RD office fixes.