Various fixes and adaptations.
Merge branch 'release/2.1.1'