Merge to 2.5.7