Merge bug25899
stable to default