Merge branch 'release/v1.0'
outside fix
Merge branch 'feature/outside-review' into develop