4.3ç cherry picked parallel fixes