This issue is now fixed by revision rev#67197