Merge branch 'hotfix/1390393672'
Edit solution/interface
Merge branch 'hotfix/1390393858' into develop