Merge tag 'v4.9.0'