Merge branch 'hv/remote-end-hung-up'