Sync with current wp version