Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0