Sync with 12.09.