Merge branch 'hotfix/revert_changes' into develop
Merge branch 'release/v1.0.2'