Merge branch 'release/2.0.0-2' into develop
Lock to 2.1.3 to avoid globals bug in 2.1.4.
2.0.0-3
Merge branch 'release/2.0.0-3'