Merge pull request #3245 from mrunge/rdt_fix