Sync with upstream 4.9 branch