Sync update with branch-2 patches