Merge tag 'rel/1.11' and bump version