Review and fix disconnections

Mikhail Svechnikovrequested to merge
m.0 into main

fixes some related bugs

Merge request reports