Manually applied hotfix 2.3.15