Sync with 12.0.
1 file changed