Fixed on branch D-15920-A