Release 2.0.6
Merge branch 'hotfix/2.0.6' into release/2.1.0
Release 2.1.0