Merge branch 'upstream/2.30.0' into tizen