Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict