More hotfixes to resolve the case issue.