Fixed by rev#85571