Merge pull request #2089 from maryamtahhan/upstream_intelRdt