Rebranch bug 25550 from stable
Merge bug25550