Synching branch_v2plus to branch_v2plus_2975 by applying the patch manually