Merge tag 'upstream/1.20.0' into tizen_base