Solved focus problem in modal dialog boxes
Merge branch 'D_FocusProblem'
Compiled after: Solved focus problem in modal dialog boxes