Co-authored-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 15115ea6) Co-authored-by: Jack Koenig <koenig@sifive.com>