Merge branch 'uiFixing/ResultDialog'