Closing this, since the original error doesn't appear no more, and the remaining part of the bug is already treated in #377435.
Closing this, since the original error doesn't appear no more, and the remaining part of the bug is already treated in #377435.