optimisation
Merge bug25992