Satya - BugFixes

GST-xml