Bump to 2.0.6
Merge branch 'release-2.0.6' into develop