Sync with the latest commercial code.