Sync with published version 2.5.