minimal fix
Merge bug25762
stable to default