Fixed by check-in [ee47021f51fa7b81bd00]