Merge branch 'bug25008'