These are downstream fixes that I submitted upstream . They were merged in 35aeab5f8e [skip ci]
35aeab5f8e