`986403f` Manually applied patch from KC511 branch.