* Forward-porting fix for bug #5365