Sync with v2.5.5