Updates

Our latest updates from SFDK