test part 1
Merge remote-tracking branch 'origin/master' into new-communication
toolbar fix
disconnect exception fix