Sync with 7.x-3.x upstream.