Merge "6/n: Rename ClientMonitor to BaseClientMonitor"