Fixing spec.
Merge branch 'release-2.0' into development