From new PR: https://github.com/diffgram/diffgram/pull/857
From new PR: diffgram/diffgram#857