(cherry picked from commit 117760ce)
This is to keep Rivet_i in master in sync with 21.6.
Rivet_i
21.6
cc / @ewelina