Merge "Combine duplicate code & document wp<> in mClients"