Transplant of bug25617 to stable
Merge bug25617