Sync with the release-11 branch