Merge tag 'upstream/2.42.0' into tizen

No match.