Merged 2.6