Is this the pending PR request will address, or can be fixed without upstream changes? 