Merge branch 'release/0.9.6' into develop
Fixed unarchiving show redirect
Merge branch 'develop'