merged SDK back