am 43341ba0: Merge "Ask the client to make itself known when it\'s not"

* commit '43341ba04298f9548e3ee6f37403eaf333dfa3bc':
  Ask the client to make itself known when it's not