This is the proper way to destroy a server connection.
BUG: 381636
Looks good, thanks for the patch.
Can go to the stable (Applications/18.12) branch