Merge branch 'sdk-develop' into tizen