Merge branch 'fixing/resultDialog'