Integrating changes from SDSC