check in for cross platform
update sdk
fix merge conflicts