Synced SDK with latest develop changes