Merge branch 'release/2.0' into develop
Refactor.
Bump to 3.0.
Merge branch 'release/3.0'