Merge "Fixed that disconnect message not showing up" into oc-dev