Disabling for now.
Merge branch 'release-1.1' into development