This change set syncs Rivet_i back with 21.6 and fix all the compiler issues previously seen. With this MR it should be fine to include it back into the Nightly builds.
Rivet_i
FYI @zmarshal @ewelina @jchapman @lcorpe @dkar