Transplant of bug25617 to stable