37fbfb3772
Fix autoCast race condition Original-merge: 7f575d724ed04d3409c104cee59de9c1be86feda Merged-by: thornbill <thornbill@users.noreply.github.com> Backported-by: thornbill <thornbill@users.noreply.github.com>