Merge branch 'rivoreo-fork' into 'rivoreo-fork-infiniband'