Fixed by rev#80600