A proposed solution is to simply backport hr_swrun.c from 5.4.4, tested and problem resolved here using this patch.
A proposed solution is to simply backport hr_swrun.c from 5.4.4, tested and problem resolved here using this patch.