BugId-100483: Comments added