This is now fixed by revision rev#69556