Same issue in maint-5.10 (but blead builds ok). Dirty fix in attached patch ("dirty" - because I can't find which change in blead missed in maint-5.10)