Satya - BugFixes

CFF alert