Merge pull request #2310 from octo/ff/intel_rdt