am 52835f5d: Merge "Combine duplicate code & document wp<> in mClients"

* commit '52835f5d201ac05743586f3553ced856d62a08fb':
  Combine duplicate code & document wp<> in mClients