BUG FIX: COMPONENT_GUID
BUG FIXES: SAP Releated