Co-authored-by: Matthew Olsson <matthewcolsson@gmail.com> (cherry picked from commit a1fca1a7f3f70e4acf15052014d5b180197df9fd)