SC-28 Implementation
SC-28 Build fix