Merge branch 'hotfix/about-fix'
Merge branch 'hotfix/1.5.2' into develop