Merge "SO header changes for xml IssueId: SO-120"