Edit solution/interface
Merge branch 'hotfix/1390393858'