Carry forward GRA async fixes