Merge tag 'v1.1.0' into next