Satya - BugFixes

cff date