Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es> Backport of e286987a27271c8ee7eb6e4d4332b563c4e6094b from master