Merge branch 'release/0.6.5' into develop
Fixed the archive view.
Fixing a couple of issues.
v0.6.6
Merge branch 'release/0.6.6'