Merge Orp RMI patches from Wu Gansha <gansha.wu@intel.com>