Client dialog events and clean
Merge branch 'work1'