Update in accordance with Meta Numerics commit 72078 / release 2.2.0