Merge "Fix disconnection event processing" into jb-mr1-dev