Please submit this upstream and link to the upstream PR here.