Release 4.0
Merge tag 'v4.0'