Merge branch 'hotfix/BugShareButton' into develop
Merge branch 'develop'