Merge "Close connection before retrying" into lmp-dev