Merge "Fix modelUnload deadlock" into main