Merge branch 'release/2.0.2'
Merge tag 'v2.0.2' into develop

Patch release