Merge branch 'hotfix/1.7.3'
UI tweak
Merge branch 'hotfix/1.7.4' into develop