Sync with 2.6.0 changes