Code

Merge pull request #2165 from maryamtahhan/feat_rdt_bugfix