Bug fixes
Merge branch 'release/v2.1'