[sprint-40 modification in resolved issues]