Merge "Prevent SSH client proxy loops"