Rebranch bug 25550 from stable