Merge tag 'upstream/3.3.0_test4'

Upstream version 3.3.0~test4