It is actually fully fixed in rev#69599.