This makes it compatible with the current code and avoid any possible crash. Automated import of CL 145516