Merge branch 'sony' into release