Code

Revert "Revert "Merge tag 'upstream/5.5.0'""