(In reply to Alex Deucher from comment #6)
> Created attachment 145971 [details] [review] [review]
> possible fix
> 
> Does this patch help?

Just applied that patch on on top of latest 5.4-rc7+ and tested it. It prevents
the hang in Pathfinder: Kingmaker! Thanks!