This is now fixed by revision rev#67212