Merged new starfoundry update.