issue-6200 - Changes according to review suggestions.