Merge branch 'release/v0.8.5'
Minor fixes on Showcases page
Merge branch 'hotfix/minorfixes' into develop