Showcase users bugs patched
Merge branch 'master' into ProfilePage
Merge branch 'ProfilePage'