hotfix - RED-2037