Merge branch 'hotfix/fix-broken-tests'
Update to master release 4.0
Merge branch 'release/2.0.0'
Merge tag '2.0.0' into develop

2.0.0