Sync with stable.