Manual update from version 1.8 to version 2.0.
Merge branch 'release/2.0'