SDK Distribution: Merging master to unstable