Changes for integration with latest SDK