History and version bump
Merge branch 'release/2.11.0' into develop