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