Merge 3560 to 2.5