minimal fix
Merge bug25762